Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test(weaver-fabric-examples): use docker compose v2 #3358

Closed
wants to merge 1 commit into from
Closed

test(weaver-fabric-examples): use docker compose v2 #3358

wants to merge 1 commit into from

Conversation

jenniferlianne
Copy link

@jenniferlianne jenniferlianne commented Jun 24, 2024 •
edited
Loading

Updates the weaver fabric example network.sh file to use docker compose v2 syntax. docker-compose
v1 will be dropped on the github runners in a few weeks. (ref: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md)

Pull Request Requirements

  • Rebased onto upstream/main branch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.
  • Have git sign off at the end of commit message to avoid being marked red. You can add -s flag when using git commit command. You may refer to this link for more information.
  • Follow the Commit Linting specification. You may refer to this link for more information.

Character Limit

  • Pull Request Title and Commit Subject must not exceed 72 characters (including spaces and special characters).
  • Commit Message per line must not exceed 80 characters (including spaces and special characters).

A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.

@jenniferlianne jenniferlianne changed the title fix(weaver-fabric-examples) use docker compose v2 fix(weaver-fabric-examples): use docker compose v2 Jun 24, 2024
petermetz
petermetz approved these changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jenniferlianne LGTM, thank you very much for the contribution!

@jenniferlianne jenniferlianne force-pushed the use_docker_compose_in_weaver_network_sh branch from 70f1ef7 to 6082460 Compare June 26, 2024 13:56
@jenniferlianne jenniferlianne changed the title fix(weaver-fabric-examples): use docker compose v2 test(weaver-fabric-examples): use docker compose v2 Jun 26, 2024
@VRamakrishna
Copy link
Contributor

VRamakrishna commented Jun 28, 2024 •
edited
Loading

@jenniferlianne I just triggered various CI actions that were not automatically run when you submitted the PR. If the tests pass, I'll approve this.

But note that docker-compose is employed in several different Weaver modules (see subfolders within core and samples for examples), and not just the test networks, so we should be doing this upgrade everywhere. Would you prefer to fix all of them in this PR itself or should we merge this and do the rest in a subsequent PR?

If you want to fix all in this PR, I'll make a list.

@jenniferlianne
Copy link
Author

@VRamakrishna Thanks. Could you please put this one through? I have another change pending which updates network.sh to use the Fabric versions specified in the makefile that I'd like to put in.

Reading the contribution guide, I thought I would separate the small-ish change into two very small ones to make the intention clear. Not sure if this was a good choice.

@jenniferlianne jenniferlianne force-pushed the use_docker_compose_in_weaver_network_sh branch from 6082460 to 6561b07 Compare June 28, 2024 16:10
@VRamakrishna
Copy link
Contributor

@jenniferlianne Here is a list of other locations within the weaver folder where docker-compose is being used:

In some locations, the docker-compose commands are in the makefiles, and in others, in scripts. You may have to do a find (or a find-and-replace) within the above folders.

test(weaver-fabric-examples): use docker compose v2
e6c4842 
Primary change:  Updates the weaver files
to use docker compose v2 syntax.  docker-compose
v1 will be dropped on the github runners in a
few weeks.

Signed-off-by: Jennifer Bell <[email protected]>
@jenniferlianne jenniferlianne force-pushed the use_docker_compose_in_weaver_network_sh branch from 6561b07 to e6c4842 Compare July 2, 2024 13:54
@jenniferlianne
Copy link
Author

Closing, will resubmit with broader changes as requested.

@VRamakrishna VRamakrishna mentioned this pull request Jul 4, 2024
Merged
5 tasks
@jenniferlianne jenniferlianne deleted the use_docker_compose_in_weaver_network_sh branch July 31, 2024 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petermetz petermetz petermetz approved these changes

@takeutak takeutak Awaiting requested review from takeutak takeutak is a code owner

@izuru0 izuru0 Awaiting requested review from izuru0 izuru0 is a code owner

@jagpreetsinghsasan jagpreetsinghsasan Awaiting requested review from jagpreetsinghsasan jagpreetsinghsasan is a code owner

@VRamakrishna VRamakrishna Awaiting requested review from VRamakrishna VRamakrishna is a code owner

@sandeepnRES sandeepnRES Awaiting requested review from sandeepnRES sandeepnRES is a code owner

@outSH outSH Awaiting requested review from outSH outSH is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jenniferlianne @VRamakrishna @petermetz